From 53600718bfe262e65263259d6f7dcdad1e6112c6 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 23 Nov 2005 13:54:40 +0100 Subject: [PATCH] Clean up use of get_pfn_from_mfn(). Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/mm.c | 3 ++- xen/arch/x86/x86_32/traps.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_32/mm.c b/xen/arch/x86/x86_32/mm.c index c89ee44967..798865d370 100644 --- a/xen/arch/x86/x86_32/mm.c +++ b/xen/arch/x86/x86_32/mm.c @@ -107,7 +107,8 @@ void __init paging_init(void) l2e_from_page(pg, (__PAGE_HYPERVISOR | _PAGE_PSE) & ~_PAGE_RW); } - for ( i = 0; i < max_page; i++) + /* Fill with an obvious debug pattern. */ + for ( i = 0; i < (mpt_size / BYTES_PER_LONG); i++) set_pfn_from_mfn(i, 0x55555555); /* Create page tables for ioremap(). */ diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 543b10c04b..1f3540325b 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -93,7 +93,7 @@ void show_page_walk(unsigned long addr) #ifdef CONFIG_X86_PAE ptab = map_domain_page(mfn); ent = ptab[l3_table_offset(addr)]; - pfn = machine_to_phys_mapping[(u32)(ent >> PAGE_SHIFT)]; + pfn = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT)); printk(" L3 = %"PRIpte" %08lx\n", ent, pfn); unmap_domain_page(ptab); if ( !(ent & _PAGE_PRESENT) ) @@ -103,7 +103,7 @@ void show_page_walk(unsigned long addr) ptab = map_domain_page(mfn); ent = ptab[l2_table_offset(addr)]; - pfn = get_pfn_from_mfn(ent >> PAGE_SHIFT); + pfn = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT)); printk(" L2 = %"PRIpte" %08lx %s\n", ent, pfn, (ent & _PAGE_PSE) ? "(PSE)" : ""); unmap_domain_page(ptab); @@ -113,7 +113,7 @@ void show_page_walk(unsigned long addr) ptab = map_domain_page(ent >> PAGE_SHIFT); ent = ptab[l1_table_offset(addr)]; - pfn = get_pfn_from_mfn(ent >> PAGE_SHIFT); + pfn = get_pfn_from_mfn((u32)(ent >> PAGE_SHIFT)); printk(" L1 = %"PRIpte" %08lx\n", ent, pfn); unmap_domain_page(ptab); } -- 2.30.2